Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customize jpi task to include api-viewer #1244

Merged
merged 2 commits into from
Oct 29, 2021

Conversation

sghill
Copy link
Contributor

@sghill sghill commented Oct 27, 2021

This is an alternate potential fix for JENKINS-66988.

It reverts the current fix and updates the war task configuration to the jpi task configuration. jenkinsci/gradle-jpi-plugin@4f4495a (first released in v0.39.0 of the jpi plugin) stopped applying the war plugin in favor of defining a jpi task that was of type War. This was not previously included in the migration guide for v0.39.0 (jenkinsci/gradle-jpi-plugin#139), but I will add it there now with a reference to this change.

I believe this is working as expected. Here is what I did to verify the api-viewer files were included in the generated plugin archive:

$ ./gradlew jpi
$ zipinfo -1 ./job-dsl-plugin/build/libs/job-dsl.hpi
META-INF/
META-INF/MANIFEST.MF
WEB-INF/
WEB-INF/lib/
WEB-INF/lib/job-dsl-1.79-SNAPSHOT.jar
WEB-INF/lib/job-dsl-core-1.79-SNAPSHOT.jar
WEB-INF/lib/groovy-all-2.4.12.jar
WEB-INF/lib/xmlunit-1.4.jar
WEB-INF/licenses.xml
api-viewer/
api-viewer/config.json
images/
images/48x48/
images/48x48/directory.png
api-viewer/index.html
api-viewer/build/
api-viewer/build/dist/
api-viewer/build/dist/fonts/
api-viewer/build/dist/fonts/glyphicons-halflings-regular.ttf
api-viewer/build/dist/fonts/glyphicons-halflings-regular.eot
api-viewer/build/dist/fonts/glyphicons-halflings-regular.woff2
api-viewer/build/dist/fonts/glyphicons-halflings-regular.svg
api-viewer/build/dist/fonts/glyphicons-halflings-regular.woff
api-viewer/build/dist/css/
api-viewer/build/dist/css/app.css
api-viewer/build/dist/js/
api-viewer/build/dist/js/app.js

Related:

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

Copy link
Contributor

@jamietanna jamietanna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one, thanks very much - this is much simpler 🙌

@jamietanna jamietanna merged commit 748e590 into jenkinsci:master Oct 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants